[POWERPC][XEN] Move gmfn_to_mfn() from page.h to mm.h to avoid recursive header depen...

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

diff --git a/xen/include/asm-powerpc/mm.h b/xen/include/asm-powerpc/mm.h
index 8c3d228d67d31082b40d62daf5ceeda366adddc5..89306a3c9544dff1a602b413994582bc685af75c 100644 (file)
--- a/xen/include/asm-powerpc/mm.h
+++ b/xen/include/asm-powerpc/mm.h
@@ -28,6 +28,7 @@
 #include <asm/system.h>
 #include <asm/flushtlb.h>
 #include <asm/uaccess.h>
+#include <asm/debugger.h>
 
 #define memguard_guard_range(_p,_l)    ((void)0)
 #define memguard_unguard_range(_p,_l)    ((void)0)
@@ -274,4 +275,26 @@ extern void free_extents(struct domain *d);
 extern int steal_page(struct domain *d, struct page_info *page,
                         unsigned int memflags);
 
+static inline unsigned long gmfn_to_mfn(struct domain *d, unsigned long gmfn)
+{
+    int mtype;
+    ulong mfn;
+    
+    mfn = pfn2mfn(d, gmfn, &mtype);
+    if (mfn != INVALID_MFN) {
+        switch (mtype) {
+        case PFN_TYPE_RMA:
+        case PFN_TYPE_LOGICAL:
+            break;
+        default:
+            WARN();
+            mfn = INVALID_MFN;
+            break;
+        }
+    }
+    return mfn;
+}
+
+#define mfn_to_gmfn(_d, mfn) (mfn)
+
 #endif

diff --git a/xen/include/asm-powerpc/page.h b/xen/include/asm-powerpc/page.h
index 9175f6204614336c8fe628f2f8da83c9e399162d..61a757fb797e7be333f47c153c5dcbf417521a4f 100644 (file)
--- a/xen/include/asm-powerpc/page.h
+++ b/xen/include/asm-powerpc/page.h
@@ -30,7 +30,6 @@
 
 #include <xen/config.h>
 #include <asm/cache.h>
-#include <asm/debugger.h>
 
 #define PFN_DOWN(x)   ((x) >> PAGE_SHIFT)
 #define PFN_UP(x)     (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)